bitkeeper revision 1.7.3.44 (3e06d943WVm5RM1KDm-9UH1Bu3ZTbA)

bugfixes

diff --git a/xenolinux-2.4.16-sparse/arch/xeno/mm/get_unmapped_area.c b/xenolinux-2.4.16-sparse/arch/xeno/mm/get_unmapped_area.c
index 332b87337792acc3750de3028b6ebab0e369a713..f97cb8927ac00b07d2059c557b2c62b24c140579 100644 (file)
--- a/xenolinux-2.4.16-sparse/arch/xeno/mm/get_unmapped_area.c
+++ b/xenolinux-2.4.16-sparse/arch/xeno/mm/get_unmapped_area.c
@@ -118,7 +118,7 @@ addr, unsigned long len, unsigned long pgoff, unsigned long flags)
     {
         if ( TASK_SIZE - len < addr ) return -ENOMEM;
 
-        if ( vma && (vma->vm_start < node->vm_start) )
+        if ( vma && ((curr == direct_list) || (vma->vm_start < node->vm_start)))
         {
             /* Do we fit before VMA node? */
             if ( addr + len <= vma->vm_start ) return addr;
@@ -135,7 +135,7 @@ addr, unsigned long len, unsigned long pgoff, unsigned long flags)
         }
         else
         {
-            /* Reached end of VMA and direct_map lists */
+            /* !vma && curr == direct_list */
             return addr;
         }
     }